Skip to content

Conversation

rgalonso
Copy link
Contributor

@rgalonso rgalonso commented Oct 9, 2024

This includes changes to properly support a self-hosted instance with non-standard host ports (and schema).

This PR also includes changes to support the Dependency Proxy. If you'd rather keep that separated as a separate PR, let me know. I've kept the commits separate to easily isolate these items.

@ANGkeith
Copy link
Collaborator

ANGkeith commented Oct 9, 2024

If you'd rather keep that separated as a separate PR, let me know. I've kept the commits separate to easily isolate these items.

yup, will be nice to keep them as a seperate PR. for easier review

Nice work ! and even nicer, you can test that indeed these changes works for your self hosted gitlab use-case.. saves us from several back and forth

Is it very late on your side ? Would you like to try adding some tests? if not i can add them, i have some free time

@rgalonso
Copy link
Contributor Author

rgalonso commented Oct 9, 2024

If you'd rather keep that separated as a separate PR, let me know. I've kept the commits separate to easily isolate these items.

yup, will be nice to keep them as a seperate PR. for easier review

OK, I'll re-push with just the first commit included.

Nice work ! and even nicer, you can test that indeed these changes works for your self hosted gitlab use-case.. saves us from several back and forth

Thanks! It was fun learning a new language.

Is it very late on your side ? Would you like to try adding some tests? if not i can add them, i have some free time

Yes, it is kind of late here. I'm Eastern Time US. If you have the time, I'd appreciate it and then I can test it out tomorrow. Also, since I'm new to TypeScript, I'm not really sure of the idiomatic way to write tests. I saw that you had written a test on the original branch (feat/add-dependency-proxy-variables), but then didn't include that in your fix/better-support-for-custom-gitlab-ports. Was that because it wasn't working, or just because you figured it was incomplete since you can't test it directly?

Co-authored-by: ANGkeith <angkeith@hotmail.sg>
@ANGkeith
Copy link
Collaborator

ANGkeith commented Oct 9, 2024

I saw that you had written a test on the original branch (feat/add-dependency-proxy-variables), but then didn't include that in your fix/better-support-for-custom-gitlab-ports

ahh because those were testing for the depedency proxy variables related stuff

and my fix/better-support-for-custom-gitlab-ports mr was more for fixing the predefined variables for custom gitlab ports users

@rgalonso rgalonso force-pushed the fix/better-support-for-custom-gitlab-ports branch from 4e9bd1e to 9b2524a Compare October 9, 2024 03:00
@ANGkeith ANGkeith merged commit cbb218a into firecow:fix/better-support-for-custom-gitlab-ports Oct 9, 2024
6 of 8 checks passed
@rgalonso rgalonso deleted the fix/better-support-for-custom-gitlab-ports branch October 9, 2024 03:03
@rgalonso
Copy link
Contributor Author

rgalonso commented Oct 9, 2024

I saw that you had written a test on the original branch (feat/add-dependency-proxy-variables), but then didn't include that in your fix/better-support-for-custom-gitlab-ports

ahh because those were testing for the depedency proxy variables related stuff

and my fix/better-support-for-custom-gitlab-ports mr was more for fixing the predefined variables for custom gitlab ports users

Ah, right. With all the back and forth, I forgot that the test was just for that feature.

@rgalonso
Copy link
Contributor Author

rgalonso commented Oct 9, 2024

I see some of the regression tests failed. Sorry about that. Is there a way to test that locally? (Again, new to TypeScript.)

@ANGkeith
Copy link
Collaborator

ANGkeith commented Oct 9, 2024

no worries, most of it are rather trivial..

Is there a way to test that locally?

https://github.com/firecow/gitlab-ci-local?tab=readme-ov-file#scripts

have you seen ^? Does it work for you ?

@rgalonso
Copy link
Contributor Author

rgalonso commented Oct 9, 2024

I'd forgotten that was in the README. I was looking for a separate CONTRIBUTING.md or the like. That's working for me now. Thanks.

ANGkeith added a commit that referenced this pull request Oct 11, 2024
Co-authored-by: ANGkeith <angkeith@hotmail.sg>
firecow pushed a commit that referenced this pull request Oct 12, 2024
* fix: better support for custom gitlab ports

* fix: support for non-standard host schema and ports (#1369)

Co-authored-by: ANGkeith <angkeith@hotmail.sg>

* test: fix regression test

Only print port if it's defined. Update expected
string to match grammar correction in production
source file.

* style: fix indentation

* docs: update wordings

* refactor: refactor

* test: refactor and add test cases for predefined-variables

* fix: variables set via --variable cli option should have the highest precedence

* refactor: dry and change image to busybox (smaller size)

* Update README.md

Co-authored-by: Robert Alonso <17463757+rgalonso@users.noreply.github.com>

* Update src/parser-includes.ts

---------

Co-authored-by: Robert Alonso <17463757+rgalonso@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants